bitkeeper revision 1.1389.5.36 (427f7513GY6Vv1b-toMAsdXzaHGvTQ)
authormafetter@fleming.research <mafetter@fleming.research>
Mon, 9 May 2005 14:34:59 +0000 (14:34 +0000)
committermafetter@fleming.research <mafetter@fleming.research>
Mon, 9 May 2005 14:34:59 +0000 (14:34 +0000)
commit09e259436510fe39c0e55a4195f5368a1a386dba
tree2bb69fe807856fb7148f331cbb27a46798b0fce1
parent96f8844d3d165eadc9cba55aa91fe2166a496e62
parent33ea028eb0fde1c4c3d3846773617e2c948354ff
bitkeeper revision 1.1389.5.36 (427f7513GY6Vv1b-toMAsdXzaHGvTQ)

Hand merge
xen/arch/x86/domain.c
xen/arch/x86/domain_build.c
xen/arch/x86/mm.c
xen/arch/x86/shadow.c
xen/arch/x86/traps.c
xen/arch/x86/vmx.c
xen/include/asm-x86/shadow.h